Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:32:23 +0000 (09:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:32:23 +0000 (09:32 -0700)
commit63d28a62d9995782b8919528400401daa7342f4b
tree79b7bf7dc51d09d0c112e46483c4bf2ff3734f89
parent943b2f68287a767d956670c764d9b53e89460e7d
parent03b36a73ed7e230124f59c0076acc07d422e00a5
Merge from trunk.